revert

git revert --no-commit dev..
git revert --no-commit $(git merge-base FRAM-1888 origin/dev)..